Merge "Revert "Prevent non-admin users from deleting system apps."" into...

Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7 am: bc227f01 am: 487c65ea am: 27d914f7

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



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