Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e am: 3c79f13642

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide9ccdb7a50e3d674cb85dfffa014c89ee52db3e