Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102

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

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