Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I45f6619df406a1e551cdfce978c20a83570a7a99