Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I036aabc2d2cb187c3b09255a9a2e93d6cbe56763