Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be am: 45c3f2cd6f am: b00e521253

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44be7ea64d012f35d312ae3b039b0fd7e37e9d60
tree: 2b9beb9b5b21e28cf0e10b715fae860211a71bfb
  1. core/
  2. services/