[automerger skipped] Merge "Check caller owns admin for per-admin getters."...

[automerger skipped] Merge "Check caller owns admin for per-admin getters." into sc-v2-dev am: 9c297221 am: bdc7f49a -s ours

am skip reason: Merged-In I443ed1f6dcd5e5b161c99dd09a4b2aef9f8ef0a7 with SHA-1 50f0f94b is already in history

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

Change-Id: Ied3e7727584bff2c45ef81821a46ef68cf7c5e26