[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get...

[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b6 am: 3fe7534d am: f3fb6b30 -s ours

am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 cfff482b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib458f32902e64c63fc1fc9e2bb5bf92be801916b