Merge "Fix b/242252080: Add padding space on the top of the battery chart"