Merge "Disable VVM account when the SIM is removed" into nyc-mr1-dev
am: 321d8e5b36

Change-Id: I120407a249052ea2acb2da8026f91a5e9940d897