Merge remote-tracking branch 'aosp/upstream-main' am: 5bc991d3cc am: f02f1a6083

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

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