Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration." into oc-dev am: 154bbb003d
am: 9a4a1d9d8a

Change-Id: I5d0235749d9527e027a4ff1bcad48da6492ac0fe