Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib5766550a76eb3bd1b71a8c9bd6547dc5ecd2143