Added data retry support am: 613ed789de

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

Change-Id: I5e8843f2b628dd26da919a2e3cb7b12b81936e4c