[automerger skipped] Remove usage of Telephonymanager getDefault() hidden API am: 70e03d953d am: f05d95638f -s ours
am skip reason: Change-Id Ifb7b53af787b86b1d6c2f91a96a330bde57271d7 with SHA-1 917199a316 is in history
Change-Id: I49bf0963376844bab066c2003177db29e1147263
This commit is contained in: