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

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

Change-Id: I5f552c43335a7a99e5924668d2286a8a4ce865d8