[automerger skipped] Merge "5G icon default changed" am: 247ae0dc am: 92629637 -s ours am: 4bea4724 -s ours am: 2c499184 -s ours am: 0f943ac9 -s ours

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

Change-Id: Id19fb1d045c3edfc43cf0fa57aa1c16c44715024