Don't cache tokens as invalid on network errors

Closes-Bug: 1172802
Change-Id: Ifc04f565b96d58a7a2f477a216b57af7f8de6a8e
Merge "Don't cache tokens as invalid on network errors"