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

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

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