Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I8522582d2ebaa4ef23c2d67f2079243971868a41