Merge "Do not register Curve25519 as a key factory directly" am: 78255ccf78

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

Change-Id: I1b104e558392aade38b967d518aee37cfea9c8a2