Merge "SystemUI: Display RAT icon when data is off"