Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 am: 50df7a46cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefc964a514ea1f5a81de0ce573ca7fe99d0fa5ed