Merge remote-tracking branch 'aosp/upstream-main' into main am: 74376c13d2 am: 50c4cf5336

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

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