Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iee65e4285a87f3870a85474ce094c1a99d74e05c