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

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

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