Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibca23395d643f3e7b627ad1d09fa1732897d31d0