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

Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf0374 am: dbe72630" into rvc-d1-dev-plus-aosp am: 369f4f61 am: 08b4801b

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

Change-Id: I72404b4fb5d6708206b4cd5b8530ddf51fbd40b5