[automerger skipped] Merge "Revert "Prevent non-admin users from deleting...

[automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7 am: bc227f01 am: 487c65ea am: 27d914f7 am: a21b2b7e -s ours

am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 90702836 is already in history. Merged-In was found from reverted change.

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

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



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