Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I54e5d2f9b6afa52614172d2b3bf863362a99dec1