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

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

Change-Id: Iafa88ae2bff1cc4548ee0a0570049979f25b0952