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

Change-Id: If5610c7effe42388bae9e48dc5e081e96346dca4