Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp
am: b1a0373791

Change-Id: I6db72138f6ba72f35f027ff5cf7e908dcb8ad121