Merge "DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing  the timeout." into marshmallow-cts-dev am: 0fdea94  -s ours am: 1a8817e
am: ca57588

* commit 'ca57588ebcd634aeb481b291b0c10f48ec9133c7':
  DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout.

Change-Id: I1a5a7918f22299f959299ff1f8fd25ec9086534a