Merge "[Settings] Fix conflict of AOSP merge on wifi call"