Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I05d2e10d18faed30a580cefcbe207a5e04b72a2b