Merge "Merge "Preventing keyguard dismissal when screen is off." into qt-dev am: ffd598557d am: c5e38fb989" into qt-r1-dev-plus-aosp