Merge changes from topic "curve25519-prep" am: f735757a25

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1907699

Change-Id: I5f9a31c30f964d63230d1b832f62eb5b9e6ac750