Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I71c3c9dcf0d732bfdea44099bc54b23090ec3cea