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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id09498294433c647915894a00d6b1f5e92acebb4