Merge "Set NetworkInfo's meter flag when capability changes." into nyc-mr1-dev...
Merge "Set NetworkInfo's meter flag when capability changes." into nyc-mr1-dev am: d5b505aa am: 65cf7f4b
am: a58b19d6
Change-Id: Ic374925716638b6177041f070b8344fdc029bf4e