[automerger skipped] Merge "CameraService: Check if the camera is disabled via device policy by user." into tm-qpr-dev am: 1cb77337d4 am: 3be69f1d57 -s ours
am skip reason: Merged-In I922def3310f39b41dade06d656569222f4db46d7 with SHA-1 d2fb6ce73c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19887604
Change-Id: I9359812656766c852546fa4a6ee31b25571a1344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: