Merge "Change OkHttp test infrastructure to not use BC provider" am: 157721cd6c
am: b546444591

Change-Id: I33b3f6d1d8d22d0e645884a6e5fc0c16213dd9f6