DO NOT MERGE: Make wifi scan interval when disconnected configurable.

Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
2 files changed