Merge "Force disable VVM if carrier app is preloaded" am: ecbcc5c8cc
am: 25551e8672

Change-Id: Ieec838d8b585fca056fc1b7d80a57a0f4e508f61