Merge changes I0e6df469,I3d46d5f7

* changes:
  Fix testMobileDataAlwaysOn flakiness
  Speed up NetworkFactory tests.
tree: 498a5ab7359492ff13d4faa89f8b73d3c53a2b79
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS