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

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

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