[automerger skipped] Merge "Add carrier config for 5G Icon" am: 2aee6901fb am: 14a78540b8
am: 74a8836175 -s ours
am skip reason: change_id Ie4b331aaec3981dea0eeada436a2123fe9287b74 with SHA1 dfb3956cf1 is in history

Change-Id: If2f7d8d27638581bec05506fc219956ab8d49d73