Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I66559abe7733e36375c6b713e5dbba9954ab949c