Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: ddee2e592a am: c045715c9a

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

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