Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id916cee7e4a276e0aea596d22d33a1fddfc3d992