Merge "Adds the old timezone to dumpsys logs after a timezone update." into main