[automerger skipped] Merge "Fix bug in getCameraDisabled for a specified...

[automerger skipped] Merge "Fix bug in getCameraDisabled for a specified admin" into udc-qpr-dev am: 6c91ff38 am: 5fc4a1fe -s ours

am skip reason: Merged-In Id6695fd589e172ff98029bccf1174b9ca4e34d6c with SHA-1 3b428b8e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24706508



Change-Id: I2ea678a8908206cdf9fc436445866e5deff735e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>