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

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



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