[automerger skipped] Merge "[SP27.3] Rename TestableNetworkStatsProvider" am: d2c1c234 am: b974f76f -s ours
am skip reason: Change-Id Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7 with SHA-1 afd76bd7 is in history
Change-Id: I5e14eec3e2a8af779c04801e9dabaa312db6ae08