Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 81f6691072 am: 05a032e4af

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

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