Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0480625cdb21d272be785f5d1d1b08de24cc9eb1