Merge "Add carrier config for 5G Icon"
am: 2aee6901fb

Change-Id: Iec2c01555d1200f707ee41f23d7ef75799d678f7