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

Change-Id: I12c7cede65e92f09a83a0217e2fdc560f4bdafdc