[automerger skipped] [automerged blank] Ed25519: Indicate Android Keystore supports it 2p: ac6337794f am: 827f0017a6 -s ours

am skip reason: Merged-In I5bf85529f75f63113c86437ee21dc1927036099f with SHA-1 c6ec3dfa73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/18672726

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