Merge "KeyMint: wrapping key must be RSA" into main am: e524ab64b8

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

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