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

[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa16 am: fb6f84fe -s ours am: d69df94c -s ours am: 7cc9540c -s ours

am skip reason: subject contains skip directive

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



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