Android CTS 9.0 Release 9 (5793965)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXVM1xwAKCRDorT+BmrEO
eE3+AJ9ZjlEQhlkF+LfWu83RuPqvY0xyggCffY6GWGdDK0KlkJ/EHtEOI4W7Mpw=
=53kl
-----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.