[automerger skipped] Merge "Do not register Curve25519 as a key factory directly" am: 78255ccf am: e74b1930 am: f908386b -s ours am: 87ebc73f -s ours am: 16503884 -s ours

am skip reason: Merged-In Ibd53070a890955affaff5e4e7213892afd423db7 with SHA-1 7dece494 is already in history

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

Change-Id: I990e48a5dfe705e8b93f7f938b22be599c9f79b0