Merge "Indicator for admin control over sensor permission grants" into sc-dev am: 1b15e79c am: 48ea5434

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

Change-Id: I763b553f5e803bc17f9bef8d02e2c34486642382