[automerger skipped] Added data retry support am: 613ed789de am: 2b428281cd -s ours

am skip reason: Merged-In I04cadac100040054d449892df50e30dc77954082 with SHA-1 cc516a8fc1 is already in history

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

Change-Id: I9af07373a74a99ed467cc2db977e00d9a708b43a