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

Change-Id: I381482c19f40360d0daa0cd97e7148df25ef844a
tree: 667d52142658981096fa426f58201bb287e5a94a
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags