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