Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.
(cherry picked from commit b91773bce1)
Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f