Merge remote-tracking branch 'aosp/upstream-main' into main am: e88edaa537 am: a9afb581c7

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

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