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: 60cf6be1

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



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