Merge "AOSP/DeskClock - Add Kotlin code for deskclock/stopwatch files" am: db9cce8d7d

Change-Id: I4c901af9ed468b925b378fba92caef39c28b910a