Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be am: 5c5eff8d5c am: fe39a927b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44be7ea64d012f35d312ae3b039b0fd7e37e9d60