am a88c6914: (-s ours) am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev

* commit 'a88c6914718127278c23626e05454ff2cfaba3fd':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash