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