Merge "Fix enforceModifyAudioRoutingPermission for system_server"