Merge "Merge "Do not re-show hint text if user is already authenticated" into...
Merge "Merge "Do not re-show hint text if user is already authenticated" into qt-dev am: 7aa5752b" into qt-dev-plus-aosp
am: b76cb7c6
Change-Id: I1004c13999c1788cc4af087e978b629fc9542394