[automerger skipped] Merge "NrConnectedState can't start NR Icon timer" am: efeeeacf am: 02d23418 -s ours

am skip reason: Change-Id Id2fe11c51684f3fa76f5a84cc92bf0b91565fb99 with SHA-1 90918159 is in history

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

Change-Id: Ib58909f7742abd10204cd0679ad983dbb5d2710e