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

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

Change-Id: Iae0ef015767c98cb02d482bbf6b2721fa5917058
Signed-off-by: Automerger Merge Worker <[email protected]>