Merge "Add UpstreamNetworkState for tethering"
am: 9b141cc23c

Change-Id: Ia7fa9dae3a9da4eb59b2998824a29b1d1f04a5f4