Merge "Change permission level for MEDIA_RESOURCE_OVERRIDE_PID"