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

Change-Id: I9cb30ad45ec6f013a0944a923c3cc950a2d319fe