Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If3d26f11f362c683b59cf6cbf615a0730f3dd1ed