Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581 am: f8cd65936d am: 6e1ffdc503 am: f3ba538ef6

Change-Id: I7b4b14cf89fcdb8881ed20f17cdddbdd39d4eca0
tree: d288601c130d301b5fab9c43c093a8a976d97216
  1. Tethering/