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

Change-Id: I5326fe9305c2329704de3911cc2ded610b4836da