Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881

Change-Id: I8ea4f4ec0781ebb28b3aeb0681123d9d1e8ba69b