Merge "Revert "Clocks were switching too frequently"" into tm-dev am: 203d94b1 am: e10ae3cd am: 2a49a808

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



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