Merge "Restrict Admin grant of sensors-related permissions" into sc-dev am: f7d42bbb am: da5bff08

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

Change-Id: Ic4a08ce878c030cd7091d0e63c1a2441b7ee6753