Merge "Replace interal okhttp APIs" am: 96a89d8f43 am: 2989d99072 am: 542786989d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da