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

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

Change-Id: Ie3391c1af5c90938d10f937dec63d81f4c4a5eae