Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" into rvc-dev am: 9dd2585d am: 991d2b0c am: 5ef94560 Change-Id: Ieb223127ff5294b85ed494a05f087c54e53c9c71