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

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

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



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