Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and...
Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration." into oc-dev am: 154bbb00
am: 9a4a1d9d
Change-Id: I5d0235749d9527e027a4ff1bcad48da6492ac0fe