[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am: 9442987fc6 am: a3b085b226 -s ours
am: 6a53998f14 -s ours
Change-Id: I1f4073a66609448766af3fc32a629f0d2f919cf4
This commit is contained in: