Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I213c3aa991ec33d4fb6e37eca390ae72df676d1a