Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I330c5f070155839b0440bdef81a7fef5a2949f9a