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

Change-Id: I847b3d07024e025040304f47de88211956d20175