Merge "MediaMetrics: Use AllowUid property for services to control client access" into rvc-dev