Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iabd4ec5347b8bad4f38c9ccd40997e1009e455f5