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

Change-Id: I07a9a25076807897399b5265cc19957f3f45d81c