Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 224481ec

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



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