Merge "Fix race condition when accessing ClockChangeListener" into udc-dev am: cec1c35e

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



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