Merge remote-tracking branch 'aosp/upstream-main' am: 0947a3b324 am: bc23d3a7f3 am: 9e23d5def2

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

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