Merge "[MS75] Replace TrafficStats data units with DataUnit class" am: 03740ec6c2

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

Change-Id: I2a80c943e5f33e678fd479f3aa8f9fc8ed86901e