Merge "TrustManagerService: remove unused field" into main