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

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

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