Merge "Animate LockScreen and AOD clock text for charging events" into sc-dev