[automerger skipped] Added data retry support am: 5169d5c222 -s ours am: 42946d3ac9 -s ours

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

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

Change-Id: I727708c3b84add40d0a3d2037c681236fd585843