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

Change-Id: I8fe9d8f1e731717ce72e6ae3208a7487cb980fbf