Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I24959869514948494abf35f3975b608450f0b359