Merge "5G icon default changed" am: 247ae0dc5c

Change-Id: Iacfb9a43b3dd782f54260da28a1ff6f08284180f