Merge "Disable MWI suppression if VVM cannot be activated" into nyc-mr1-dev
am: 5f192c76c7

Change-Id: Ibe5eb698073aca7591010497f8e3cd3513bd36fa