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

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

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