Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev