Android CTS 6.0 Release 31 (4890202)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZrQAKCRDorT+BmrEO
eI3KAJ4pOiqvq7gMOBE3Z3Nu6sP61OD+HgCfVAZU2y73N/ZNv3DEqwHG/qi+qbY=
=BPJA
-----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.