Merge "Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time"