Merge "Fix issue that Wifi Calling preference is showing wrong value." am: 84bf5c765c am: 74c0891bc7
am: 92fbc57ef1  -s ours

Change-Id: I898f46501005df214685d55599ea4fb9abc6d64e