Manually merge AOSP changes into internal main.

For some reason, the AOSP changes in this project got merged into
udc-qpr-dev-plus-aosp, but did not merge into main.

Bug: 279548314
Test: N/A, project not yet in the manifest.
Change-Id: I51fca7db96972139693a6bddc2bbc91249f752b6