[automerger skipped] Merge "Added data retry manager and retry rules" am:...

[automerger skipped] Merge "Added data retry manager and retry rules" am: 293c6b3e am: 72437f79 am: f1adfa0d -s ours am: 3481093b -s ours

am skip reason: Merged-In Ieb1fb96eddc98dd2192334bf7234bd9b0364a51f with SHA-1 2339f779 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2001330

Change-Id: I6a9b9713f2103c975da41726c4bbac03c2b43741