[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e am: 3c79f13642 am: a095858f1f -s ours
am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 d101ec8f87 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib458f32902e64c63fc1fc9e2bb5bf92be801916b
This commit is contained in: