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

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



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