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

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

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