Merge branch 'expected_upstream' into aosp/master

This CL updates EXPECTED_UPSTREAM file only.

This CL is produced by running the following command:
git merge expected_upstream
git checkout aosp/master -- ojluni/
git checkout expected_upstream -- EXPECTED_UPSTREAM

Bug: 225139449
Test: n/a
Change-Id: If1a06d12e367a664a2b862a7892ce159e3ef181a