Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_typing am: 670c4eddc0 am: 036d69ad17

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

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