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

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



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