[automerger skipped] Merge "Consider preferred network type for 5G icon" am:...
[automerger skipped] Merge "Consider preferred network type for 5G icon" am: a1640b21 am: 6bd7cd8d -s ours am: 1472964e -s ours
am skip reason: Change-Id I8867561e550c987cc4c43d6e1bd8c14f0118e946 with SHA-1 ad9b7091 is in history
Change-Id: I25b7d46d31474578a1e8ba277b0988d6b671a229