Fixing isDeviceIdAttestationRequired to require both cases instead of just one am: e759072541 am: 3eb91702f9

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

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