Merge "Set baseConfigBuilder as parent for localhostBuilder" into main

            NetworkSecurityConfig.Builder localhostBuilder =

                    NetworkSecurityConfig.getLocalhostBuilder();

            addDebugAnchorsIfNeeded(debugConfigBuilder, localhostBuilder);

            localhostBuilder.setParent(platformDefaultBuilder);

            localhostBuilder.setParent(baseConfigBuilder);

            mLocalhostConfig = localhostBuilder.build();

        }

        mDefaultConfig = baseConfigBuilder.build();