Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I46f8e43d16b015a09ab37fb88dcb30db9fc01f0a