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

Change-Id: I1c52b4f5c7395ac78a76406fd1c484683e1dd8c6