[automerger skipped] Merge changes from topics "data_retry", "setup_data" am:...

[automerger skipped] Merge changes from topics "data_retry", "setup_data" am: 228cce86 -s ours am: bb509e39 -s ours am: da47a45e -s ours am: 503fc3ae -s ours am: 2857cb67 -s ours

am skip reason: Merged-In Ifc26a8550e272618b59e5a566de803a63921da08 with SHA-1 22603e8d is already in history

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

Change-Id: I229454558eb41fe04830fc3a6c50c202fd9f2bc7