Merge remote-tracking branch 'aosp/upstream-main' am: 9263e0cd4a am: 301de27c41

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

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