Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4737e0c57a81f2883301d93bd4542c51f11b16b7