[automerger skipped] Merge "Updated the logic to determine the VSR API level for device ID attestation tests." into 24D1-dev am: d57230da58 -s ours

am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 3f6c8a250d is already in history

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

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