[automerger skipped] Merge "Enforce missing permission getCameraDisabled" into sc-v2-dev am: 60aed7329d am: f4e3b530b9 -s ours
am skip reason: Merged-In I521ffd81f93c5c2576e9324152856b4a4933c094 with SHA-1 30e223d132 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934241
Change-Id: I30f35bda19c611dc13c160e72655823e1787cd2d
This commit is contained in: