Merge "BatteryMonitor: fix depending on multiple versions of the same...

Merge "BatteryMonitor: fix depending on multiple versions of the same aidl_interface" am: bf3c1c56 am: df200d81

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381873



Change-Id: Ia9623504468317bdf4fc2cadbc46b81cd9b35912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>