[automerger skipped] Merge "Use cached preferred network type for 5G icon" am:...

[automerger skipped] Merge "Use cached preferred network type for 5G icon" am: 9c37d93c am: 97c1d427 -s ours am: aeab3326 -s ours

am skip reason: Change-Id I5d1e33981e25a3c8e0a644baf4bbb7a6c1e805ac with SHA-1 7a4afd39 is in history

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

Change-Id: Iaf63027fe1b4446bb1daf8e271060a6bbf3bbbad