Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"