Merge "Keystore 2.0: Add keystore2 support to the keystore-engine." am: d076ea7950

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1553283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dfee6bb20b271b4f636d3718ab2374b1061241f