Merge "SystemUI: Display RAT icon when data is off" am: e441298a11
am: 1fed537674

Change-Id: I32a4c932a9abdacd1fd43a34b650a88377b1ed07