Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I54ee1305c155b62ec76b65a0c1c5e75e5b147829