Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1c am:...

Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1c am: dbc4b983 am: cd1ecd65

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



Change-Id: Ic6fa41c74683d4501fde1da171e99d7f967997d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>