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

Change-Id: Iba425b2c685431bbbab797441b78f0b357a1ab00