Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I1337c3f3647ca6cae2ba329ef561f5deebfc8137