Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest"