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

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

Change-Id: Ie3727d63b2e3849db029c7f00c5edc328ae5d4c6