[automerger skipped] Merge "4G+ RAT icon can not be displayed when back to 4G...

[automerger skipped] Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" into rvc-dev am: 9dd2585d -s ours am: 60adf9ab -s ours am: d7a4097d -s ours am: dd6185a1 -s ours
am skip reason: Change-Id Ic9a26ff932647b09d8770304c3057b572afaf2a4 with SHA-1 c43aef76 is in history

Change-Id: I589ad99a2fe1ed06a359d379dc890eec5a9350ce