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

Merge "Clocks were switching too frequently" into tm-dev am: 5ecc0793 am: 3cb99928 am: 18d9734a

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



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