Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0465c6705e4652a69a2d74b1fbe265b27966f610