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