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

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

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