am 06508824: am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues

* commit '06508824dc699c566bc4ffbd816b2227fba15379':
  DO NOT MERGE: CameraService: Fix permissions check issues