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

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



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