[automerger skipped] Renamed retry interval to retry duration am: 93d21eb6...

[automerger skipped] Renamed retry interval to retry duration am: 93d21eb6 am: 0e439816 am: ac6216c7 -s ours

am skip reason: Change-Id Ibb1332d85a0518c96ba8fd01b24b2699c915c89d with SHA-1 f58d7c83 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39e0ffaf43832f498eff521acca0830e19f531ad