Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I1bcff03831f2f1e3691a33c570490228592c4345