Merge "Merge "The secondary timer rule checked by wrong state." into rvc-dev...

Merge "Merge "The secondary timer rule checked by wrong state." into rvc-dev am: f7a65efc am: 614958a4 am: be52d75d" into rvc-qpr-dev-plus-aosp am: d5a39690

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

Change-Id: I16b902ab9781f44ab647ca7cff0ab8727ab2fd0d