Merge "Updated the logic to determine the VSR API level for device ID attestation tests." into main am: 15a04c4d1f am: bcefcf2a13

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2977823

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