Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32