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

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

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