Merge "Enable WiFi calling for test SIM 001-01" am: d6b05710d4 am: 287a4be9ff
am: 0b7475287c

Change-Id: Ib0448d8bc1479855cff13f0b6305f60cdbc7fba9