[automerger skipped] Merge "Add 5G icon to System UI" am: 01b016eef8 am: 988978b706
am: ed23e3397c -s ours
am skip reason: change_id I6fba0f9c42fff3cb1398895b122f18f13de239f7 with SHA1 a62d32b656 is in history

Change-Id: I7440f12c447c6985a6b5336572bcb1de88820396