[automerger skipped] Merge "Switch trust agents to extend unlock mode by...

[automerger skipped] Merge "Switch trust agents to extend unlock mode by default." into qt-dev am: b9cead91 am: c189b9df -s ours
am: 9b2ec5e0 -s ours
am skip reason: change_id Ifad45f90e0f2b5c3d180a74a97a89d45d75cb02a with SHA1 d3268c2d is in history

Change-Id: I7d57e7901110645091ee2d034ff75b96b7d2eb81