Merge "[Settings] #getCdmaRoamingMode should use ReadPrivilegedPhoneStatePermission to check instead of ModifyPermission" am: 1623361248 am: 8d8f53445a am: ef67f6a023

Change-Id: I85bce23c199d91645e73d3fb1c5f88482fe693e2