Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev