Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 81f66910

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



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