tree 980130e1e60421eeb1933a27b6053e5b8e53b7a9
parent e14bda80851a137214ab2991e73e5a80ca9e2517
parent e961a6f5f6107fe47e8270c00d37245fc2ba5465
author Shuo Qian <shuoq@google.com> 1546032855 -0800
committer android-build-merger <android-build-merger@google.com> 1546032855 -0800

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

Change-Id: I86fa89bae8ddc4934619ddd1e6478eb2fafaa462