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

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

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