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

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

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



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