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 am: e4764b2b

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



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