Merge "Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b2 am: 5da11cba" into tm-d1-dev-plus-aosp am: 64df3013 am: d5b5c96f

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



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