Merge "Added global retry support" am: 5b38038d57 am: 237bb0bdaf

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

Change-Id: I6c6492529d7de439dd6c9f2aadf9bfa4b2349c78