SystemUI: Allow showing data type with roaming indicator on MSIM.

  If a device sets a system property "ro.config.always_show_roaming"
  the roaming indicator will not replace the data type icon, but create
  a new indicator alongside signaling that the sim is roaming.

Change-Id: I60ac97572b9b50e4809dbd809a8e5a2d0763542e
Merge branch into kk_mkt

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/MSimSignalClusterView.java

Change-Id: I2c5686a890d5e9ab4e953f6bb586e065f667f7df