Merge "Remove demo HVAC property in favor of using the emulated VHAL."