Merge "Rename system property to enable KeyMint VM" into main am: e4193a055f am: f3751ac99a

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

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