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: 00bedd61

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



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