Merge "Switch trust agents to extend unlock mode by default." into qt-dev am: b9cead91f8
am: 254a302641

Change-Id: I0d44882bb84789693880f229e4146b2480b83735