Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id031b49a15fa622239193eb4e624e897f2fad2e0