Merge remote-tracking branch 'aosp/upstream-main' into aosp am: 2d55f2ba2a am: 7b8a26ed66

Original change: undetermined

Change-Id: Ic8f6a490c2798d5ceeb14befa9bb6ddcc965f2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>