Android CTS 7.0 Release 11 (4120754)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlldR0wACgkQ6K0/gZqxDngoTwCgh2saUXy/yfjl/Bh9hCILRq0d
jsAAn349OG6bJhYTAILOLb0GuthjVKvG
=iYQJ
-----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.