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

Bug: 235099911
Test: TH
Change-Id: I4d26ec572a097d07fecefcb91a6fcdfd64b93cd1