am 2c5d4ecb: am 0838eadb: Merge "Move Wifi-calling setting to Call settings" into mnc-dev

* commit '2c5d4ecb8168017f563e4c9230a64399641bdf41':
  Move Wifi-calling setting to Call settings