Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am:...

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

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

Change-Id: I1b1ef67d7da03e900ab2d9985e816dab6e49dd15