[automerger skipped] Revert "DO NOT MERGE Add data integrity checking for wifi passwords" am: 84522169be
am: b83d799bbf -s ours
am skip reason: subject contains skip directive

Change-Id: I28172adccf7710789918154f77b8a6820da5cfee