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: f6ebbab3 am: c7078d57" into rvc-qpr-dev-plus-aosp am: 5bf4e33c

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

Change-Id: I4c770f1801417326ef931374f7a3b0fd9a23f2c8