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

am skip reason: Change-Id If0dbab8baca0dadeef2c6fec4fd74528f416db24 with SHA-1 49cd0cc8cd is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f5fee8f4ea10a224b52232b99ad79e888bb68e