I messed up the mapping. As penance, add tests for everything and make
the Android tests less of a mess.

The failure mode here is P-521 client certificates won't quite work
right in TLS 1.3. I believe TLS 1.2 and below would not have been
affected.

BUG=672972

Review-Url: https://codereview.chromium.org/2567523003
Cr-Commit-Position: refs/heads/master@{#437963}