Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b8546 am: f0d6757404

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

Change-Id: I4eb14d6d898406af4390db2389ef60f56dc39444