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

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