Merge "SchedulingPolicyService: Fix UID for cameraserver" into nyc-dev am: e9bfc4e am: 9b7b970
am: adf1118

* commit 'adf11184bf22f9d8976d2882f86f35dd7818e082':
  SchedulingPolicyService: Fix UID for cameraserver

Change-Id: I504c4da2721ce27a67fb7c0a737c8d88c5331d08