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

Change-Id: I6541e0452750a9d58d25eab8e65d6b2018567aa6