Merge "Fix some fields in WifiInfo are not written into Parcel"
am: 5add10333d

Change-Id: Idce8900c306b8e59f89825f34d0190c3092136b1