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

Merge "[automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7 am: bc227f01 am: 487c65ea am: e910cac0 -s ours am: 0ed5ea25 -s ours am: f2fa50a0 -s ours" into tm-d1-dev-plus-aosp am: 3a26761b -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: I2ac071c20f0a3322fd876873b08d72bb11bcc223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>