Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I202d4ed7f89c151c8e2b347719c41a1a52b81856