Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb
am: fc6cb188b5
am: be8b195fe1
am: 2f068a914e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809 Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
This commit is contained in: