Android CTS 7.1 Release 26 (5353817)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXIk8mQAKCRDorT+BmrEO
eHOAAJ9bEL/kVORoBLAnm2MnDYmuNPDCPwCfVTCjwGPHrZqUeP7aAuyNHsIA1aA=
=Y1kU
-----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.