Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7a028056acffedf0b2435139744439986cfa6a1b