Merge "Remove usage of Telephonymanager getDefault() hidden API"