[automerger skipped] Merge "Added global retry support" am: 5b38038d am:...

[automerger skipped] Merge "Added global retry support" am: 5b38038d am: 237bb0bd am: b6ca2e00 -s ours

am skip reason: Change-Id I632d4dc07fb545fa04eb3aefb0ff3270ee8f6ff8 with SHA-1 7d8a77da is in history

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

Change-Id: Ic1ffefe5c952fe656cfd936d5d5d10ea20d93c3f