[automerger skipped] Merge "5G icon default changed" am: 247ae0dc5c am: 9262963701 -s ours

am skip reason: Change-Id I298b0eb496f5aae8c812ccfa375e2649fc9c2a64 with SHA-1 56e1a31265 is in history

Change-Id: I71bd4ec15982444e10996e2c35950db3503bb70e