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

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



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