Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I232930335697d18ccb0fd48ff196cd7a5d77e9f3