Merge "BatteryService: restrict service notification logic"