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