Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I8c9a5dfad2eaaaa3fc5f75514e9c0b2410686589