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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I466a533429cfa32372a2be3e885ec53339eb999c