Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I81d3d86c25958ef79ad48415fd0534739b35ff8a