Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444 am: 433b9738b3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddff8e1ac79c589ddf34518b2e8f9627be25c550