Merge "Add logic to keep 5G+/5G UC icon when RRC idle" into udc-qpr-dev am:...

Merge "Add logic to keep 5G+/5G UC icon when RRC idle" into udc-qpr-dev am: 8fcaa6c4 am: bfeea312

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



Change-Id: I932dc21a8dbf5ed88a2835800a1f5d323e96ff26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>