Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iff092f12d10d1048fa3696ef21554fb9facd6d90