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

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



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