[automerger skipped] Remove usage of Telephonymanager getDefault() hidden API...
[automerger skipped] Remove usage of Telephonymanager getDefault() hidden API am: 70e03d95 am: f05d9563 -s ours am: f2f6a6b6 -s ours
am skip reason: Change-Id Ifb7b53af787b86b1d6c2f91a96a330bde57271d7 with SHA-1 917199a3 is in history
Change-Id: I2e2391326e7c1322add30b2e40301c2adabc23c5