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

Change-Id: I66a2c7fc7313e989504839617b466d86eae59904