Merge "Add test case for CrossSimCallingPreferenceControllerTest"