Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/DeskClock into cm-13.0

Android 6.0.1 release 22

Change-Id: I174a915a6ac768351a2931457ebc2f250162b4bc
154 files changed