Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639
am: dfd9942a31

Change-Id: Ia14b87efb46acf8ad8c4ad7921fdefdceb185f86