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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a89eee64c57fbf04e21ee0996eff435584f709
tree: 311817039786b710d7be77729a55f1f27b4fb708
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS