Ignore-AOSP-First: No merge path from AOSP Bug: 177729159 Test: Not testable until more CLs land Change-Id: Iea4e70bb5b4ce051492f2e42d2e0d219d088388e