Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev
am: 712fc079a0

Change-Id: If745d92f94ce75b0298dbc66f53731a1faab09c4