Merge "Merge "SchedulingPolicyService: Fix UID for cameraserver" into nyc-dev am: e9bfc4e am: 1df18b7b" into nyc-mr1-dev-plus-aosp