Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I680c61edb0adda913b2cc127c38050c03ca77b2c