Merge "Hide the stop button for the device admin app in the task manager" into...

Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b2 am: 86af120e am: 4d08e650

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



Change-Id: I5f4557fdbef6ffb26b274b31ff83da4840b72fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>