[automerger skipped] Merge "Refactor permission checks removeActiveAdmin" into sc-v2-dev am: 0f08cc3733 am: fa92c2a55a -s ours

am skip reason: Merged-In I132e09f680c06fb5068bdbe140c08cafcc13f102 with SHA-1 11d2fb77a1 is already in history

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

Change-Id: I4366f3b5da26165574c78237baa0d1918c2b5051