[automerger skipped] Added data retry support am: 613ed789 am: 2b428281 -s...

[automerger skipped] Added data retry support am: 613ed789 am: 2b428281 -s ours am: 0c35e4e0 -s ours

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

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

Change-Id: I45fefd12dd6c44d70dd06104ee0f0854da895415