Unpin keyring, just skip keyring 2.0

As per bug 1197988, keyring 2.1 has the bug fixed, so unpin keyring.

Change-Id: I9e60e134bed338781cc5a14ee8caae4bc93a538c
Merge "Unpin keyring, just skip keyring 2.0"