[automerger skipped] Merge "Added global retry support" am: 1ceca0b1 am:...

[automerger skipped] Merge "Added global retry support" am: 1ceca0b1 am: f64aa575 am: 4c2d584f -s ours

am skip reason: Change-Id Ifc44f3265492c7862d7daa97c1141e1f6eefc0b3 with SHA-1 974fa145 is in history

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

Change-Id: Ib737aad3f795f18d1f1206926103ace92ec9d4e2