Merge remote-tracking branch 'aosp/upstream-master' into typing am: a90fb3c4d9 am: f8e1873b59

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

Change-Id: I9adcfc2ebd7138700477a653c9f068d3466c1d87
Signed-off-by: Automerger Merge Worker <[email protected]>