Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)"