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

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

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