Merge "hwcrypto: Removing batch key definition" into main am: 4c5ab8db99

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

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