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

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



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