Merge remote-tracking branch 'aosp/upstream-main' am: 5a897454ff am: cc61586906

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

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