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

Bug: 235099911
Test: TH
Change-Id: I0b184546891527120bad69bdcfbb035e06f36001