Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
am: 796b510787

Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b