Revert "Revert "Clocks were switching too frequently"" am: c6e714a9

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



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