Merge "Merge "Use ConnectionManager API to check if network is metered." into nyc-dev am: b853005f3c am: 0ce15caf77" into nyc-mr1-dev-plus-aosp