Merge "Do not turn Wifi off for sustained performance test" into nougat-mr1-cts-dev