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

This reverts commit 8f069f830ab23cade4d7594212daf73bab3c0196.

Reason for revert: 361639651

Change-Id: I4e2f746fc407d553a2aa748e066d8b78056677ce
11 files changed