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

Merge "[automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7 am: bc227f01 am: 487c65ea am: e910cac0 -s ours am: 0ed5ea25 -s ours am: f2fa50a0 -s ours" into tm-d1-dev-plus-aosp