Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I7697121a40d45ac9c2a5c177501aa004ad6d2713
Change-Id: Icfef4229734ad232e586e5c09e346e307383e01c
tree: d747d6d7702d9a6e69b19996fdb19bf42a620a66
  1. android-5.4/