Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I3f3d51c5ec32369ba0c31113822118d4bffe4147