Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd am: 9f660a96

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

Change-Id: Ibefac6909a265458dec0e41dd6b3f2f324580558