Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0cf3117a17c0894cd10557555065318a79ec38b8