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

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

Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4