Merge remote-tracking branch 'aosp/upstream-main' into external/oboe am: 844cbfe455

Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/3002363

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