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

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

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