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

Change-Id: Ifd8243e5581775d33516e3cdb6059c627191c01f