Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of just one" into main am: dd98cc1189 am: 9648fd64d8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3243582

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