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

Change-Id: Id296677b99d452bceb4bac0704c9d19e103c1082