Android CTS 9.0 Release 3 (5016358)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW70QGAAKCRDorT+BmrEO
eA5zAJ4qaoL/p7/VbeT+G2XqSoZYhLkEDwCfXfzZ9urPJoGAl/z6gYhrxWB8Y00=
=PblZ
-----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.