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

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

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