Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest"