Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I959ef2207c273b9bad89e5c3f9e84cf5d57332de