[automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am:...

[automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a3 am: 980a6b8d -s ours am: f9b99dcc -s ours am: f1c467cb -s ours

am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed16 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925

Change-Id: I8ef7b1529c9fb1765618e3b8e18041957f4c344b