Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" am: e225e5dc70 am: da6b0cc682

Change-Id: Id13fa8eb567f9c0dac247918ab868a1b869cf701