Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of just one" into main am: dd98cc1189

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

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