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

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



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