Merge "Delete NetworkStatsFactoryBenchmark" am: 26de69ea34 am: c9a9de1777 am: 6d84b81ece

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976231

Change-Id: I6cdfc54a8b8a83afddfb907f2d0edf3de1f17e10