am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
automerge: 7736d37

* commit '7736d37568980fdcee9c261de8a207977a720bb9':
  Improve TrustManagerService user lifecycle