Merge "Address API review for admin-granted permissions" into sc-dev am: 9ac9fe53bf

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

Change-Id: I73e451c7ed8ffe673f78335bc2493c38a6345f5b