Merge "Rename the VMDS property to VMS which is how it is called now. Test: Fixed HAL tests with the new property name Bug:34682582"