DO NOT MERGE: CameraService: Fix permissions check issues

Bug: 15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_av into kitkat