Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I9dc0c49eb8d4ed2450c848d17e55977c3ef3805b