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

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

Change-Id: I11df051ca4a32ab72b93cf0e7ebb21457e9a5196