[automerger skipped] Merge "Add retry loop for BootImageProfileTest" am: f9cb43d6eb am: 1f0c20e85f
am: b5ffced130 -s ours
am skip reason: change_id I12e101447d2a42fb0fcad7ad3427750c3ce89a79 with SHA1 233c33956b is in history

Change-Id: I3bb66bbf580d006b8304ad84ae02a08f6e4e6af9