Merge \"Merge \\"Merge \\\"Make registerDefaultNetwork work on metered networks.\\\" into nyc-dev am: 33cdc4d136  -s ours\\" into nyc-mr1-dev am: 6f93a6c2c3\" into nyc-mr1-dev-plus-aosp
am: 23a027d911

Change-Id: I173678ab505e60158335258459c68eddeae124ec