Merge "Adds new mappings to content descriptions for custom clock faces" into udc-dev am: bd10aa9c9c am: c326c026c5

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

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