Merge "WifiCallingPreferenceControllerTest migrated to junit" into sc-dev