Merge remote-tracking branch 'aosp/upstream-main' into main am: 74376c13d2

Original change: https://android-review.googlesource.com/c/platform/external/python/bumble/+/2684431

Change-Id: I015a2e3d3dc437dfbf8dea2e7efa214870188615
Signed-off-by: Automerger Merge Worker <[email protected]>