[automerger skipped] Merge "Fix NR display logic for non-LTE RATs" am:...

[automerger skipped] Merge "Fix NR display logic for non-LTE RATs" am: 6db57f5c am: e227b2b5 -s ours

am skip reason: Change-Id Ic22c60f19b6cd2c7fc4388f27f2ef1aaaba2e66d with SHA-1 913a451d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d4287562ed7820ce939dfeb67f74987b511992d