Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff93d3ee047dc5dc5584d944e1e9a0a3d639cbc8