Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev