[automerger skipped] Merge "Keystore: Wire X25519 key agreement" am:...

[automerger skipped] Merge "Keystore: Wire X25519 key agreement" am: a1ae227b am: 5df13aef -s ours

am skip reason: Merged-In Ifc12be528ab544fd6909bb0dd6224a0a4dd400c6 with SHA-1 4c20e224 is already in history

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



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