[automerger skipped] Merge "[Settings] Add permission for #getCdmaRoamingMode...

[automerger skipped] Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01e am: 7b8e8255 am: 3f236596 -s ours
am skip reason: Change-Id Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 with SHA-1 4a7ad4d7 is in history

Change-Id: I9dd3f027e1f3c2422295e9a47d3eecd82a5bb62b