Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I063cb954f1833c45debf25cb0b072706eb55d2c4