Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4e8a46bdbe740019e904cb3cc44d97e597337f1d