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

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

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