Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev