Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I876b781bbaeb60b6ef59ff28190c67b300b591ce
tree: d747d6d7702d9a6e69b19996fdb19bf42a620a66
  1. android-5.4/