Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I03ecec46ece61d7ee14306c80c36959fe0c2def9