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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1da66e6782f1901c215e7f3970e4c0f8363188ef