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

* commit '698078a7e9a59d5e4cf959a761ccb9a74377cfa4':
  Improve TrustManagerService user lifecycle