Merge "TrustManagerService.java: fix SynchronizeOnNonFinalField warning"