Merge "Revert "Prevent non-admin users from deleting system apps."" into...

Merge "Revert "Prevent non-admin users from deleting system apps."" into tm-dev am: c10451f7 am: ef3226c3

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



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