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

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

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