[automerger skipped] Merge "Switch trust agents to extend unlock mode by default." into qt-dev am: b9cead91f8 am: 254a302641
am: 05d9f87b7f -s ours
am skip reason: change_id Ifad45f90e0f2b5c3d180a74a97a89d45d75cb02a with SHA1 f60611c3de is in history

Change-Id: I961439d1d6a3a27759b0e4954db4a960a7fe601b