Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/packages/apps/DeskClock into HEAD

Android 4.3 release 2.1

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	res/xml/dream_info.xml