Merge "Clocks were switching too frequently" into tm-dev am: 5ecc0793a1 am: 3cb99928f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122721 Change-Id: I14a03851f267db1e57e134dc245f7caedd0afadc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: