Merge "Indicate that a TrustAgent kept the phone unlocked" into qt-dev
am: f1abb75702

Change-Id: Ia2aa85b93aa62d38986743edacc79c9a853e2b2e