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

* commit '70fd44fa022351b4451e61a7f0927362f4e33da8':
  Improve TrustManagerService user lifecycle