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

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

Change-Id: I434f357498548057901ca933883590eba69834b6