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

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

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