Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e