Merge remote-tracking branch 'aosp/expected_upstream' into fix-vector-test-mergeconflict

Bug: 259253323
Test: n/a
Change-Id: Ie3662f3a5775342f4da23bc75498af0e6f7d9021