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

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



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