Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev