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: bd588d16 am: 5f3a566e am: ca85e277

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



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