Merge "Remove usage of Telephonymanager getDefault() hidden API"
am: 29146f991b

Change-Id: I3b389f3d8f4cae83fa7cf462eb222cdf8995b483