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

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



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