Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iec73f31fd85fec36caceddf10fa3c04178df45bc