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

Bug: 235099911
Test: TH
Change-Id: Ic4b5b1512c5bed482c8d0a5281b4c8c85421f548