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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0502659732c1957b297095a5332e6dc0b514397