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

[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e am: 476be4be am: 916d292b am: fee26edc am: 044600c7 -s ours

am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 90702836 is already in history

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



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