[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: ef3226c3 am: 721d428b am: c528ca78 -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: If051db56e940589b670f9f60a88366d1f930a1f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>