Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I9c0e7ff9bfd069f0e03056f4bec78d4d681ccdeb