[automerger skipped] Merge "Add a method to note waking network packets to BatteryStats" am: b3238fc8 am: caebc659 am: 96a1abd2 -s ours

am skip reason: Merged-In I1a29fc7cbe74990e317f0d62d3894523387bdde1 with SHA-1 53b10b22 is already in history

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



Change-Id: If29445e52ab11799aa2df8ebe8ae21983f3db4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>