Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0344e289efa8d0f713949b8d718cc06845de6671