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

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

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