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: 176e361c
am: a794566f
Change-Id: I47c4505884b028252a7d443b11f1851baf443c50