Merge "Rename KM VM related system properties" into main am: abe7640a

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



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