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

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

Change-Id: I46660fd7f7ba99cff2c72edfc7fdc8ab65defc28