Merge remote-tracking branch 'aosp/upstream-main' am: 0947a3b324 am: 9808477a01 am: 68db002c9b

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

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