Merge "AOSP/DeskClock - Fix improperly formatted resource strings in DeskClock."