Merge "Add a way to set attestation IDs from HAL" am: 240510ae84 am: 3946d2b2bb

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2291293

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