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

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

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