Merge "AOSP DeskClock: unit test fix"