Android CTS 7.1 Release 2 (3681763)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliaHY8ACgkQ6K0/gZqxDnhT2gCdE8pCGgKof5N71W3flgwL0v9m
ACIAn2cSsqWRdxMqbmPz5rukkYox56jO
=7JFW
-----END PGP SIGNATURE-----
Merge "Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user." into idea133
automerge: 507028e

* commit '507028e964c7cbc448cc7273daf5017a3d2fad9f':
  Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user.