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

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



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