Merge upstream commit 'a2f18cffc96dde7edace9538a117e446d4108d5c' into master am: ce594071ea

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

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