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: I5e85c5c767bb8f154c056479f4d8bc8aa15f5bac
Signed-off-by: Automerger Merge Worker <[email protected]>