[automerger skipped] Merge "Added global retry support" am: 39c87475 am: 30636cbc am: 799f854a -s ours

am skip reason: Change-Id I763afdf34378512c60c0838830cb84875b1c66f0 with SHA-1 990cc41d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1504811

Change-Id: Iaef3f63ef6daa51009887afd88fbdf8291706c28