Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf0374...

Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf0374 am: bae5889d am: 6f86a8e5 am: a58885af

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

Change-Id: I9688701637cf9f1f98445ade65ad7d1b8c844592