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

Change-Id: Ifbc1e5d15337a7a678ee4ef9ef346dcf046cb69b