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

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

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