am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService"...
am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d533
* commit '2a5663d5':
Add device locked API for TrustAgentService