[automerger skipped] Merge "Do not use default to get TelephonyManager" am: 99f6957f2e am: c175a8ac85

am: e961a6f5f6  -s ours

Change-Id: I86fa89bae8ddc4934619ddd1e6478eb2fafaa462
This commit is contained in:
Shuo Qian
2018-12-28 13:34:15 -08:00
committed by android-build-merger

Diff Content Not Available