Merge "Revert "Revert "Clocks were switching too frequently""" into tm-dev am: 0aa4fa44

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



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