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

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

Change-Id: I7fd587fc13f540ec5488ead33b7187c2245d25aa