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: 2a82df99

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



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