Android CTS 6.0 Release 18 (3942491)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkJEjwACgkQ6K0/gZqxDnjG2gCdG6Ux72eAD5d21r3srYnBk0v5
PlkAnReNOcpiRSmHub6jmcLySmK+GBXc
=uZB/
-----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.