Merge "Change content for dynamic clock" into udc-qpr-dev am: 6c70c5ec am: 62fdd17c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24589167



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