Merge "Merge "Revert "Set Visibility on ClockSwitch Animation"" into tm-qpr-dev am: 7682aaed8b" into tm-qpr-dev-plus-aosp