Merge "Add logic for 5G icon to SIM status dialog"