[automerger skipped] Merge "Allow the network stack to read network stats history" am: 7e4a864f60 am: 5ac12d9b41 am: 851900ba6c am: dd98f7a35b -s ours
am skip reason: Change-Id Ibb6342b0f263c874bb1f7ab4031a639778bad37e with SHA-1 4c1d8a48fc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: I7881c107ed04304221e694ea28b692159f426c31
This commit is contained in: