Merge "Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" am: a0cef3c9c1  -s ours am: 8bb42caffb  -s ours am: 00539a10a3  -s ours" into oc-dev-plus-aosp