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

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

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