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: Id5faa0df1562b86f241af4ec492c4a51209826a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>