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

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

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