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

Change-Id: I5da0dee9e45352370b6b38c6995be080415d5588