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

Change-Id: I1f4073a66609448766af3fc32a629f0d2f919cf4