Merge "Added global retry support" am: 39c8747585 am: 30636cbc1a

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

Change-Id: Icbdebe6afc16ff4263000cb39ea5f140358c2993