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

Change-Id: I5d38d593850b7134af2711742222c57c8752cc09