Merge "AOSP/DeskClock - Add Kotlin file for CitySelectionActivity"