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

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



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