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

Change-Id: If5610c7effe42388bae9e48dc5e081e96346dca4
tree: 8c571b0251bf769057b03aa1d5b636f2915d5d96
  1. tests/