Merge "Prevent user stop of protected apps" into tm-dev am: 564965fc

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



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