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

Change-Id: Ib17bfb34652b6d68d963dafdbe72e2d48903d139