Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I83a15a8e280672effe2d07cd811e814373002c79