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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2abfe8dc61292a2b0799ae09295c76ead656f3f7