Merge "Make CtsLibcoreOkHttpTestCases runnable on Q" am: 75560ff2be am: 81e68a0e03 am: f3e6682193 am: 4bd15163dd am: 04548011cc

Bug: 150623130
Test: atest CtsLibcoreOkHttpTestCases on Q

Change-Id: I974dbda87e05b90b72a3aaec12cff57db922afce
(cherry picked from commit 961a6b6b6a53e7b7c989872b2fa58e1c108cfc8b)
2 files changed