Merge "Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev am: 9736fb2a am: 25211cdd" into tm-d1-dev-plus-aosp am: e90fee44

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



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