Merge "Merge remote-tracking branch 'aosp/upstream-main'" into main am: 8b1d05f921 am: 7a78fe3792

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

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