Merge changes from topic "am-634d952f08614fa0aca96affb0e2bd38" 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: 7be25392 -s ours am: 8e2363d1 -s ours am: aa88b995 -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: 2c33c032 -s ours am: 3d82e8cb -s ours am: 34e24b1a -s ours