Merge "Revert "Consider preferred network type for 5G icon"" into rvc-dev am: 612ab308 am: 2ef251e6

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

Change-Id: I575e4721ca960ad602e298a859c86a97b11285fb