Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev
am: 1f29891f4b

Change-Id: I413f470b6397dabde6e027c21792e8cfc52e2077
tree: e869fe9cfba01e41daf847813bd01af0557e8ff2
  1. tests/