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

... to pull in https://crrev.com/c/5913519.

Bug: b/320202326
Bug: b/309244873
Test: CI
Change-Id: I353d0c39c44f600d6070a9796f4fd4b824f1848a