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

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

Change-Id: Ie984fbdbacf4d88656c358a40f7ad5b0ef73992b