Merge "Add a retry mechanism when error is recoverable" am: b02eee5c am:...

Merge "Add a retry mechanism when error is recoverable" am: b02eee5c am: 6059e6c3 am: 361074d9 am: 2f66da25

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



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