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

[automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into tm-dev am: c10451f7 am: b891fcce -s ours

am skip reason: Merged-In I55a3d322e84aaaced69bd5edeaf90e82ac9a0dd3 with SHA-1 02a03d77 is already in history

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



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