[automerger skipped] Merge "Do not use default to get TelephonyManager" am:...
[automerger skipped] Merge "Do not use default to get TelephonyManager" am: 99f6957f am: c175a8ac
am: e961a6f5 -s ours
Change-Id: I86fa89bae8ddc4934619ddd1e6478eb2fafaa462