[automerger skipped] Merge "Revert^3 "Keystore: Validate curve names in XDH...

[automerger skipped] Merge "Revert^3 "Keystore: Validate curve names in XDH and ED25519"" into 24D1-dev am: 6b003be2 -s ours

am skip reason: Merged-In Ie63b8dfc8bb562b33e6e529d537bde64ae2c6d53 with SHA-1 934cd662 is already in history

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



Change-Id: Idfdd2e4d65453b876303719c20c1b97109562ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>