[automerger skipped] WifiConfigStore: Store integrity data in same file
am: 952fc8f58d -s ours
am skip reason: change_id I528d3402cb047cca3793be5f1386c4bb60c39a10 with SHA1 bc2c802713 is in history

Change-Id: I66e1a40d3a209bbddbebc6c283b05a5b848abf0d