Merge changes from topic "clock_cherrypick_fixes" into tm-qpr-dev am: 6e98d9838d

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

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