[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am: 2b39d6d2a0
am: 110b875969  -s ours

Change-Id: I965178ec99083dcd907841b4959e456f6d492516
tree: c8006a1361f66e4b14dcbe5c64ab0431923fa07a
  1. core/
  2. services/
  3. tests/