[automerger skipped] Added data retry support am: 5169d5c2 -s ours am:...

[automerger skipped] Added data retry support am: 5169d5c2 -s ours am: 42946d3a -s ours am: bf9e179e -s ours am: 029ebf34 -s ours am: c5fe46d0 -s ours

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

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

Change-Id: I6a1e8d64e5f251c200961d30104037b2015d3a7c