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

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



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