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

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

Change-Id: Id37dddc45836bb75f911f93da71f11f49a843e83