Merge changes from topic "revert-1522123-move_keymint-JSIHXWHLZI"

* changes:
  Revert "Move keymint to android.hardware.security."
  Revert "Remove references to keymint1"