Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0f9dd622bced9e740ca9c68de091d9f5b044dc91