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

Change-Id: I48b5d230015a4d61556fda1f4bd65681136c12d7