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

Change-Id: I52ed76c98a6d7b148099e1bbcd98d06188931ac8