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

* commit '16a198085dbfd28a8cd1ef31b88eb6eef08145aa':

Change-Id: I2775504a695ca0255a20561731cb86ffa81d7685