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

* commit '9b7b970b5d42eee23b3bbfda88bb25257870c72e':
  SchedulingPolicyService: Fix UID for cameraserver

Change-Id: I9439ba2fad2e54ea3a122df46d9b5f0432aff9fe