Merge "Revert "Pivot network statistics to use DataInput/Output."" am: 362c825b3a am: 431f1396f1 am: 0d56d5c957

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

Change-Id: I47df2f22217ea021cb9b8913435c0148e3460159