Merge "Added global retry support" am: 5b38038d57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504714

Change-Id: I1ba711516770aba4d6311821136d0146702a4aa4