Merge "[BatteryEventFramework] Update util functions for BatteryEventModule" into main