Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev
automerge: 3b0dc26

* commit '3b0dc26b2902cbbcc1dcc1dea3c973b3c54c46cb':
  Ensure JobScheduler Connectivity CTS reenables WiFI