* changes: Enforce MEDIA_CONTENT_CONTROL in verifyPackageName Simplify if/else branch in MR2ServiceImpl