Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I2d73b817e816be3b88b3673288cb94ac3c352475