Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibdbe4c4de2049a9c6d1d7974e6f8e032c4505f2c