Merge "tearDown: Wait for wifi previous state to actually be restored" into marshmallow-cts-dev am: a1c7005404 am: 997b5a1844 am: 0fb241a46a am: 5cdb1180a6
am: 4c8ecdf8d4

* commit '4c8ecdf8d4ff3705ccdcebaf62fa46853ff13ba8':
  tearDown: Wait for wifi previous state to actually be restored