Merge "Fix some fields in WifiInfo are not written into Parcel"