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