Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am: a0cef3c9c1  -s ours
am: 8bb42caffb  -s ours

Change-Id: I44fad7c2f04f01257cdc2873243657cac744bf22