Merge "Changing traits to support opaque keys for kek and kak" am: f728067b46 am: eaafbe0074

Original change: https://android-review.googlesource.com/c/platform/system/keymint/+/2388652

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