[automerger skipped] Merge "Revert "Consider preferred network type for 5G...

[automerger skipped] Merge "Revert "Consider preferred network type for 5G icon"" am: 89e847da am: 9534f5fc -s ours am: 771b61a8 -s ours am: 2d72f3b8 -s ours am: 68e36db9 -s ours

am skip reason: Change-Id I6fadabaea9eb2b051e2e2fc6daf3f8b642ddaccc with SHA-1 c096823f is in history

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

Change-Id: I9d6921f83e4c278e2b47de1765198234608f9bd5