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

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



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