Merge "Mark keymint as unfrozen to manage keystore2's imports" am: 1d11ba4cfa am: 258ac5a777

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

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