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

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



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