Merge upstream commit 'c66b357de6908cf3680d83a73c6744451e2d0fa0' into master am: 006fe63152

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

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