[automerger skipped] Make XDH key sizes 255 within Android11-tests-dev am: 55b8ed1d50 -s ours am: c2bf3289d7 -s ours

am skip reason: Merged-In I538534009f98306db6a65f2dcef84cbb98045aa0 with SHA-1 de47c1cc82 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3007392

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