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

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

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