Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main am: e3db2085 am: 33053b6f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365402



Change-Id: I9df4f6fd231a26bef9008782f4a729ca2c02ea19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>