[automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a
am: 980a6b8d30
-s ours am: f9b99dcc03
-s ours
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925
Change-Id: Iee7a51b34008ec3059d60c7bf2c6082348b73120
This commit is contained in: