[automerger skipped] Merge "Allow the network stack to read network stats history" am: d3f3538817 am: b9caef1c05 am: d01a482a10 am: 28f9a4110d -s ours

am skip reason: Change-Id Ibb6342b0f263c874bb1f7ab4031a639778bad37e with SHA-1 9ebadfcf7c is in history

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

Change-Id: I7881c107ed04304221e694ea28b692159f426c31