Revert of Enable public key pinning of local trust anchors

components/cronet/android/api/src/org/chromium/net/CronetEngine.java

Index: components/cronet/android/api/src/org/chromium/net/CronetEngine.java
diff --git a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
index f3638a27e98cb234e00dafe8fd074d03cda62f84..bd2f22401d9ab8dbdfe910ae5d20fab1eb00a4ef 100644
--- a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
+++ b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
@@ -102,8 +102,7 @@
         // See setters below for verbose descriptions.
         private final Context mContext;
         private final List<QuicHint> mQuicHints = new LinkedList<QuicHint>();
-        private final List<Pkp> mPkps = new LinkedList<>();
-        private boolean mPublicKeyPinningBypassForLocalTrustAnchorsEnabled;
+        private final List<Pkp> mPkps = new LinkedList<Pkp>();
         private String mUserAgent;
         private String mStoragePath;
         private boolean mLegacyModeEnabled;
@@ -136,7 +135,6 @@
             enableSDCH(false);
             enableHttpCache(HTTP_CACHE_DISABLED, 0);
             enableNetworkQualityEstimator(false);
-            enablePublicKeyPinningBypassForLocalTrustAnchors(true);
         }
 
         /**
@@ -546,28 +544,6 @@
         }
 
         /**
-         * Enables or disables public key pinning bypass for local trust anchors. Disabling the
-         * bypass for local trust anchors is highly discouraged since it may prohibit the app
-         * from communicating with the pinned hosts. E.g., a user may want to send all traffic
-         * through an SSL enabled proxy by changing the device proxy settings and adding the
-         * proxy certificate to the list of local trust anchor. Disabling the bypass will most
-         * likly prevent the app from sending any traffic to the pinned hosts. For more
-         * information see 'How does key pinning interact with local proxies and filters?' at
-         * https://www.chromium.org/Home/chromium-security/security-faq
-         *
-         * @param value {@code true} to enable the bypass, {@code false} to disable.
-         * @return the builder to facilitate chaining.
-         */
-        public Builder enablePublicKeyPinningBypassForLocalTrustAnchors(boolean value) {
-            mPublicKeyPinningBypassForLocalTrustAnchorsEnabled = value;
-            return this;
-        }
-
-        boolean publicKeyPinningBypassForLocalTrustAnchorsEnabled() {
-            return mPublicKeyPinningBypassForLocalTrustAnchorsEnabled;
-        }
-
-        /**
          * Checks whether a given string represents a valid host name for PKP and converts it
          * to ASCII Compatible Encoding representation according to RFC 1122, RFC 1123 and
          * RFC 3490. This method is more restrictive than required by RFC 7469. Thus, a host