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

* commit '1df18b7bcaed66542e43eb57354ac1a1d3bb3291':
  SchedulingPolicyService: Fix UID for cameraserver

Change-Id: I65b7c129676b7fff61a67d72aa1f248a7c35f42d