Merge "Revert "Clocks were switching too frequently"" into tm-dev am: 203d94b1 am: 0fc457c9 am: 22c9f01f am: 6b838781

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



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