Merge changes from topic "am-bd8380ff117a4a3396ab39955df80cbc" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa16 am: fb6f84fe -s ours am: d69df94c -s ours am: 7cc9540c -s ours am: 93cb81e4 -s ours am: f98feec2 -s ours am: d4f2435b -s ours am: cd0f8763 -s ours am: 091e25c4 -s ours
  [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f932 am: cf5587d2 -s ours am: 2f4d46fc -s ours am: f36dd9d9 -s ours am: 3d587853 -s ours am: 9efe4fd3 -s ours am: 4dbfb214 -s ours am: ba0245e7 -s ours am: ac40d249 -s ours