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 am: 49c0a30a

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



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