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

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

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