Merge "Add 5G icon to System UI" am: 01b016eef8
am: 988978b706

Change-Id: Ib4c18eda89eb4c566d2a6912b549734ba3bcd94c