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

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

Change-Id: I809734cf9e08afe98d75340aa4bc41dd18b185c1