Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7cbbd7940224fdddb402a4e00c335bf7fb96c680