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