Merge "SystemUI: Display RAT icon in quick setting when data is off" am: f845bbdfa4
am: 592f539419

Change-Id: I88d871f593ff64ebea1c36f42a8fe59d69d3b6f3