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

Merge "Clocks were switching too frequently" into tm-dev am: 5ecc0793 am: 5645bfdd am: 2acba095 am: 5b9a7ff2

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



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