Merge "Do not listen to clock change if should hide clock" into udc-dev am:...

Merge "Do not listen to clock change if should hide clock" into udc-dev am: b8ef4889 am: e53ec881

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



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