TestKeyStore: more possibilities for KeyStore creation

Needed for change I379de26bdae3de1d0fe867adc1d8b7d5443c8c7a in
external/conscrypt

Bug: 17972577
Change-Id: Iaeb36167d953533e23d610bf218488bd79b6430e
1 file changed