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

Change-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d