Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I5771870298a4f9bdb8d0a4089240cba0f1dd6be4