am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev
am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev

* commit 'f64247e417ffcffb76bd47af417f4f3623073f88':
  Fix change to re-add carrier roaming details.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base