Merge "Add vm name and version to am capabilities" into main am: 9e3197876e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3086485

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