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: d7198334

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



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