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

8a3215bf536ebc280de963918207009cbc7442f8

Change-Id: I299a95b80910f102a652cbd577838ddfc65fdbc6
12 files changed