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

Change-Id: I2697bd8d2df5ef9a519b29bed577d81c3043266a