Merge "CTS test for NETWORK_TYPE_METERED job constraint" into oc-dev am: 60060d479b
am: ff39d01ef7

Change-Id: I22fddf3d59e7e9f91d3385ee361c8c9bfff73d0d