Merge "Modifying HwKey::deriveKey parameter" into main am: d128fd66e1 am: 387c67d4dc

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

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