Manually merge aosp/2760185

Internal automerger won't work before the project is added to the
main manifest.

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