Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5

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

Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5