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

Change-Id: I2b1be68cd2eea8a4795a882933ed91dbf6ed83ee