Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425 am: 42cc0967a5 am: d6e1adf8e5 am: 95ffd6d878

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf6e0b590cb6bcb8909b9bc54073ca36fe8a0210