[automerger skipped] Add a retry mechanism when error is recoverable am: 4dc410d5 -s ours

am skip reason: Merged-In If0fe30f0b98b83a723e14ea8f6cd9a96c54e1691 with SHA-1 b4e39c87 is already in history

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



Change-Id: I87469907e652abaac6a820f5f552126d80cb4577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>