[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am: 3580a6a996
am: fc1bde9261  -s ours

Change-Id: I965178ec99083dcd907841b4959e456f6d492516