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

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

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