Merge "Remove NetworkStats hidden API dependencies from StatsPullAtomService" am: 3f9910630b am: 9570d3f1fa

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

Change-Id: Iaf6cf9ad3c148ac2bd46de6cf4e2f755320c1efb