Merge "[x509] Include Apk/Apex info in attestation certificate extension" into main am: fe44d53236

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2859402

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