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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48cb973018ef4f81b088232894c9ae087bd2d431