Merge "ECDH SPI interface" am: e43b86d5b1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95b8cb39fd5f57c08c43dbdcae1c0828e93f3666