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

Change-Id: Ic5a9369569af828e40eb084e313994309d85d096