Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 337df70e17

Change-Id: Iba519e0e11af591d93f9bca5e09aab6191240b39