Merge "Merge "Revert "Revert "Clocks were switching too frequently""" into...

Merge "Merge "Revert "Revert "Clocks were switching too frequently""" into tm-dev am: 0aa4fa44 am: bb71c0c3 am: 5b1655db" into tm-qpr-dev-plus-aosp am: f2170e0c

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



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