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

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



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