[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am: 2b39d6d2a0
am: 110b875969 -s ours
Change-Id: I965178ec99083dcd907841b4959e456f6d492516
This commit is contained in: