Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78 am: dbd149504f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05ab743bf2e0f0be39e93591c0832c8cc9116931