Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I45552e1c34010fd39a7a2296051264a2fd8adde9