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

Change-Id: I28b2cd7d17191c36c691e2c6940de021e532ff96