[automerger skipped] Merge "[SP27.2] Rename TestableNetworkStatsProvider" am: f4794c26 am: db859972 -s ours
am skip reason: Change-Id I6c359dc718c24c384b827a465980b1c1c24075a0 with SHA-1 28ec2993 is in history
Change-Id: If3ad36cadb50d1b200c878b373209710fa4fd37e