Merge "Keystore: Fix Device ID attestation test." am: c56709a2c4 am: 738d6b3be4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646359

Change-Id: I3088d4d48728e24d4e81250eaac77147da0bd19c