Merge "keystore2: Implement ECDH in wrapper." am: ceb7564ed5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6a7f686c1e700db8f69647af58d98ac3b0a3c6a