Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I695d17d9b824718e61ddb09bb759f3796357537b