Merge "Add UpstreamNetworkState for tethering" am: 9b141cc23c am: 5c351eb894

Change-Id: I7f327288397b91a65945143061598ca5bb5823ab