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

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

Change-Id: I13f6757e3865068b4316143667d8137c75da3c19