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

[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 81f66910 am: 05a032e4 am: 9834aed1 am: c4ce4c82 -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/+/19569853



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