[automerger skipped] Merge "Reset timers when radio is off or unavailable" am: 99f476ac am: 21f80e00 -s ours

am skip reason: Change-Id I358ef63454cb37aebe30845dfbd9d9186ed44aec with SHA-1 f6bf8886 is in history

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

Change-Id: I8fab2f4844397c93f5ca564224ad532bc5789dd4