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

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

Change-Id: I24d533d5093fae58059ec394e71beee5328e513b