Merge "Remove IBatteryStats from ConnectivityService module" am: a06c417b0f am: 7ed2eb0997 am: fe4b159779

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a89eee64c57fbf04e21ee0996eff435584f709