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

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



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