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

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



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