Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev am: 052a08bcda
am: bfc0a8de45

Change-Id: I03b5c3f447fb6adfd7988ee68998969c28888243