Merge "Fix issue that Wifi Calling preference is showing wrong value." am: 84bf5c765c
am: 74c0891bc7

Change-Id: Ibe51ff35d007503632289f2adeccd1ec24c9eed1