Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib28ffb0c8fd0788891e4570444126901871e25d1