am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0

* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901