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

Change-Id: I4788613dae993bc922e419fcf888c36a020da623