Merge "Merge remote-tracking branch 'aosp/upstream-main' into master" am: 127794c6a5 am: 5761825687 am: 5bd8a87b1b

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

Change-Id: I7d8a1cd5500db0d3b45d5560a2428e82a8527546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>