Merge "Add a method to note waking network packets to BatteryStats" am: b3238fc8a4 am: caebc65963

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

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