Merge \"WifiNetworkHistory: Ignore file not found exceptions\" into nyc-mr1-dev
am: 958eb1fb96

Change-Id: I2b2cc0be16c4597e935c39e24f65c0aceae7a1d7
tree: 75b9cc9f109bde2e8bca473411faf338b6649dfb
  1. service/
  2. tests/