Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_pyyaml am: e6b3401a72

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

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