Merge "Don't activate VVM if carrier config changed without signal" into nyc-mr2-dev
am: 5e0088de28

Change-Id: Iace2ba7e9cd7cb632492f215b09f1bda93721200