Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I54a20439db2d52dcab22664e79675ff79a5f2e67