Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b26a am: 86af120e9e am: 4d08e65062 am: 49c0a30a33
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>
This commit is contained in: