Merge "AOSP/DeskClock - Add Kotlin files for City data files"