Merge "Fix infinite loop in TrustManagerService exception handler."