[automerger skipped] Mark ab/7061308 as merged in stage. am: 8455d548b7 -s ours

am skip reason: Change-Id I7697121a40d45ac9c2a5c177501aa004ad6d2713 with SHA-1 84a8b1d7a8 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5fe477dcd232e63672fb67bf0eb9e711867d027
tree: d747d6d7702d9a6e69b19996fdb19bf42a620a66
  1. android-5.4/