Return: National Data Roaming [1/3]

Credits: CM

Change-Id: Ibc20b5ed2bd8c94d8aa6fb0350caf819e82bfe98
Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_opt_telephony into HEAD