Merge "Extending `AttestKeyTest#EcdsaAttestationID` test to use IMEI as attestation id." am: 506089a8e9

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

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