Merge "AOSP/DeskClock - Add Kotlin code for the deskclock/controller"