Merge "tearDown: Wait for wifi previous state to actually be restored" into marshmallow-cts-dev
am: a1c7005404

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