Revert "Merge remote-tracking branch 'aosp/upstream-main'"

Revert submission 3308804

Reason for revert: b/373667975

Reverted changes: /q/submissionid:3308804

Change-Id: Ieb4e87d2bdcd975f5aa231c8e05f1053963c6c6e
12 files changed