[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d1 am: 0fdbb79d -s ours am: 49903f64 -s ours am: 263e7f5a -s ours

am skip reason: subject contains skip directive

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



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