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: Idcd4a3fc512fb1e8a01a713433a1ef0d09efc9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>