Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I06c1411036224d9d23137d127764cf4bd102f980