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