Merge "Add tracing to record battery changed broadcast event." into main