Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I2428b5c36a812a2b0de2ebfbad66b5fecdfb11fc