Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I93f71ab9d33561237d3e0c468d34f82731694ef9