[automerger skipped] [SP18.3] Adapt TestableNetworkStatsProviderCbBinder am: b7011d2265 am: 8c23b65a4f -s ours

am skip reason: Change-Id Icfd6ff289d6689ae2d5753d3fe472516c808dc7a with SHA-1 da5dfd9f0d is in history

Change-Id: Idd4405970a9caa2665dd337eea5c5c5408831ed5
tree: 1026a08bb4c4dddb4cc1d42f4832a60062b7042e
  1. Tethering/