Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev am: 9736fb2a am: 37ff11e2 am: 280f4275

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



Change-Id: I3618b5ef92155ce119c0141680e22fcd1481a5e8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>