Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 1dc2a0d77b
am: 7798357a86

Change-Id: Ifa656c5e1183e266f1e93bbc05dbfd58bc744030