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

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



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