Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I3b0235857151b835b377bc45d2e027f5b4bcf93e