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

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

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