Merge changes from topic "curve25519-prep" am: f735757a25 am: fcbf714a03 am: 7a5b90faca am: 54080a2df0

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

Change-Id: I3130906449f9683e80a959ba4700b99d18e0ac14