Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I66c64ea6ac184da2c65f2e10d71f2ce66e811d6c