Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie718a218f85265627c2e8088806bbc950cb2eb9e