Remove com.android.okhttp references

Bug: 69505783
Bug: 71420101
Test: make update-api and inspect result
Change-Id: I9e0f2a3ee43cc4eeb9e566bb5ac4cc6ad4bf90c5
diff --git a/Android.mk b/Android.mk
index 8583718..9d9f2fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,6 +116,7 @@
 
 LOCAL_DROIDDOC_OPTIONS:= \
     -stubpackages $(subst $(space),:,$(apache_http_packages)) \
+    -hidePackage com.android.okhttp \
     -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/src \
     -nodocs \
     -api $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE) \
diff --git a/api/apache-http-legacy-current.txt b/api/apache-http-legacy-current.txt
index dfc7fcd..0b3f127 100644
--- a/api/apache-http-legacy-current.txt
+++ b/api/apache-http-legacy-current.txt
@@ -216,12 +216,11 @@
     field public static final int UNKNOWN = 0; // 0x0
   }
 
-  public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable com.android.okhttp.OkCacheContainer {
+  public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable {
     method public void close() throws java.io.IOException;
     method public void delete() throws java.io.IOException;
     method public void flush();
     method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
-    method public com.android.okhttp.Cache getCache();
     method public int getHitCount();
     method public static android.net.http.HttpResponseCache getInstalled();
     method public int getNetworkCount();