Merge "Clocks were switching too frequently" into tm-dev am: 5ecc0793 am:...

Merge "Clocks were switching too frequently" into tm-dev am: 5ecc0793 am: 3cb99928 am: 18d9734a am: 1d9bc53a

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



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