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: 1d74bf5f am: 02d26dcd

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



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