Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main