Merge "Show the stop button in the task manager for user allowlisted apps"...

Merge "Show the stop button in the task manager for user allowlisted apps" into tm-dev am: f8ef8474 am: 52567816

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



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