Merge "Set the strong auth requirement based on flags when the user is...
Merge "Set the strong auth requirement based on flags when the user is stopped" into qt-dev am: 83518d94 am: 9a447b9d
am: 93082cf8
Change-Id: Iba5db3e544d26ee0bce2fcd5e397659595d84b46