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

am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I790467f6686315cf66a20f0629a03bee01ea44a7