Merge "Change the icon for the LOGGED_IN notification." am: bf359de7cf
am: fce3635550

Change-Id: I9013d2d147979ffc03bc0da6b9a503f8ce623b70