[automerger skipped] Merge "Remove @hide usage in DataUsageUtilsTest" am:...

[automerger skipped] Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b85 am: f0d67574 am: b6bdb02b am: 6f757284 -s ours

am skip reason: Merged-In Icf86598dc2e4e8b24e08135de8a842f52ac4ab5b with SHA-1 3a11e3e2 is already in history

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

Change-Id: I7753f14366e33c7095fd356e34a9bacb92a53f68