Merge "Added global retry support" am: 39c8747585

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

Change-Id: If2e338d8e8d9a9a288030b853c573fdc0689b52f