Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Icc328d29208fdbbea58c075796be350d2e8f16b0