Merge "Revert "Pivot network statistics to use DataInput/Output."" am: c170ac33a2 am: a19fe930fe am: 7d3f0be8fd am: 1c61a32074

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

Change-Id: I9a6119c89249370ca895aae728380153b8aaf6fc