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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc28b0d25485ada9d78d2732ee742c4e5195ace4