Merge "Merge "Fix race condition when accessing ClockChangeListener" into...

Merge "Merge "Fix race condition when accessing ClockChangeListener" into udc-dev am: cec1c35e am: 7c75fe53 am: dd7a4b20" into udc-qpr-dev-plus-aosp am: 5e5a5c78

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



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