Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I655845cf08c49fecbac30255fe78143465833379