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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20981744



Change-Id: I92d620058a8342550a148a4314706cd0219273ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>