Merge remote-tracking branch 'aosp/upstream-master' into pyserial am: 348b762da3 am: cca8c1983c am: ae372032e5 am: 742eee7094

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

Change-Id: I8d511e7445de9d38bffadfab5a1751b906a52ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>