[automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: 9151f7c748 am: acaac38457 -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 09d50fe69d is in history
Change-Id: I5e14eec3e2a8af779c04801e9dabaa312db6ae08
This commit is contained in: