tree 08d5077a2a3e281ecb12fd887b178d947ee74bcf
parent 4a686288a58e9b291c022bd7f9db9c807ae1ec9e
parent b9cead91f80184fa0cc58ed49f74bc3cdb142ffd
author Vishwath Mohan <vishwath@google.com> 1561084574 -0700
committer android-build-merger <android-build-merger@google.com> 1561084574 -0700

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

Change-Id: Ifbc1e5d15337a7a678ee4ef9ef346dcf046cb69b