Merge "SystemUI: Display RAT icon in quick setting when data is off"