Merge "5G icon default changed" into rvc-dev am: de9cd9f42f am: 07ab7e3ba5

Change-Id: I6b67ff5be051718eefffa6af874f0b9c9d86ad84