Merge "Revert "Pivot network statistics to use DataInput/Output."" am: c170ac33a2

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

Change-Id: I0f50460688b434522476a2160f3884e897dafad6