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

Change-Id: I530e4c189bf238cf9f4bc6b430c4cee724634840