Merge remote-tracking branch 'aosp/upstream-main' am: 7de74c2900

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

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