Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev am: 712fc079 am: 33f5edee Change-Id: Id68bcd06b1893aceaee1a37032b0f05fbd024a8e