[automerger skipped] Prevent non-admin users from deleting system apps. am:...

[automerger skipped] Prevent non-admin users from deleting system apps. am: 6c870e15 am: 15ab50ec am: d719add2 am: 78927a35 -s ours am: b2d49662 -s ours am: 31c1a83c -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/+/17408864



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