Revert^2 "Move keymint to android.hardware.security." am: 815e896239

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1525185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01fc15b38da02a6c9bd37885dc97fa359fa7ae11