Merge "Rename KM VM related system properties" into main am: abe7640a21 am: 28ef6ba54d

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

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